From: Peter Michael Green <plugwash@raspbian.org>
Date: Mon, 20 Apr 2026 02:21:11 +0000 (+0000)
Subject: Manual merge of version 1.92.0+dfsg1-2+rpi1 and 1.93.1+dfsg1-2 to produce 1.93.1... 
X-Git-Tag: archive/raspbian/1.93.1+dfsg1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com//%22stanciumarius94%40gmail.com/%22/%22http:/www.example.com/%22stanciumarius94%40gmail.com/%22?a=commitdiff_plain;h=e9fdc5b43f5a446f4f4b048e1215490e51bdd1d0;p=rustc.git

Manual merge of version 1.92.0+dfsg1-2+rpi1 and 1.93.1+dfsg1-2 to produce 1.93.1+dfsg1-2+rpi1
---

e9fdc5b43f5a446f4f4b048e1215490e51bdd1d0
diff --cc debian/changelog
index d3f65e18f9,e1464bc836..c62aff9288
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,23 +1,40 @@@
- rustc (1.92.0+dfsg1-2+rpi1) forky-staging; urgency=medium
++rustc (1.93.1+dfsg1-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +  [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
 +  [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite for arch all builds as well.
 +  [changes introduced in 1.91.1+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Add armhf to the list of architectures where clang rt is unavailable.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 04 Apr 2026 12:11:40 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 20 Apr 2026 02:20:26 +0000
++
+ rustc (1.93.1+dfsg1-2) unstable; urgency=medium
+ 
+   * doc: fix cargo book reference
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 08 Apr 2026 19:02:02 +0200
+ 
+ rustc (1.93.1+dfsg1-1) unstable; urgency=medium
+ 
+   * build: disable clang-rt on armel
+   * Upload to unstable
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 07 Apr 2026 13:41:25 +0200
+ 
+ rustc (1.93.1+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * build-wit-bindgen: call twice for both versions
+   * d/rules: de-duplicate lists of workspaces (Closes: #1048141)
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 10 Mar 2026 13:38:51 +0100
  
  rustc (1.92.0+dfsg1-2) unstable; urgency=high
  
diff --cc debian/rules
index 5109744a7e,9905c621ff..bc6fa13987
--- a/debian/rules
+++ b/debian/rules
@@@ -52,10 -52,10 +52,10 @@@ ifeq (armhf,$(DEB_TARGET_ARCH)
  CLANG_RT_ARCH = armhf
  endif
  
- ifneq (,$(filter $(DEB_TARGET_ARCH),armhf sparc64 mips64el hurd-i386 hurd-amd64 x32))
 -ifneq (,$(filter $(DEB_TARGET_ARCH),armel sparc64 mips64el hurd-i386 hurd-amd64 x32))
++ifneq (,$(filter $(DEB_TARGET_ARCH),armel armhf sparc64 mips64el hurd-i386 hurd-amd64 x32))
  # sparc64: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061125
  # mips64el: has profiler, but buggy atm (32-bit overflow in some counter?)
- # x32: has profiler, but no builtins support upstream, so disabled for now
+ # armel, x32: has profiler, but no builtins support upstream, so disabled for now
  CLANG_RT_ARCH =
  PROFILER = "false"
  PROFILER_PATH = ""